Autogenerated HTML docs for v2.2.0-rc0
diff --git a/git-rerere.html b/git-rerere.html index edcb37c..18bb84c 100644 --- a/git-rerere.html +++ b/git-rerere.html
@@ -3,7 +3,7 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en"> <head> <meta http-equiv="Content-Type" content="application/xhtml+xml; charset=UTF-8" /> -<meta name="generator" content="AsciiDoc 8.6.6" /> +<meta name="generator" content="AsciiDoc 8.6.9" /> <title>git-rerere(1)</title> <style type="text/css"> /* Shared CSS for AsciiDoc xhtml11 and html5 backends */ @@ -87,10 +87,16 @@ ul > li { color: #aaa; } ul > li > * { color: black; } -pre { +.monospaced, code, pre { + font-family: "Courier New", Courier, monospace; + font-size: inherit; + color: navy; padding: 0; margin: 0; } +pre { + white-space: pre-wrap; +} #author { color: #527bbd; @@ -219,7 +225,7 @@ } div.imageblock div.content { padding-left: 0; } -span.image img { border-style: none; } +span.image img { border-style: none; vertical-align: text-bottom; } a.image:visited { color: white; } dl { @@ -349,7 +355,7 @@ margin-bottom: 0.1em; } -div.toclevel1, div.toclevel2, div.toclevel3, div.toclevel4 { +div.toclevel0, div.toclevel1, div.toclevel2, div.toclevel3, div.toclevel4 { margin-top: 0; margin-bottom: 0; } @@ -407,18 +413,14 @@ span.overline { text-decoration: overline; } span.line-through { text-decoration: line-through; } +div.unbreakable { page-break-inside: avoid; } + /* * xhtml11 specific * * */ -tt { - font-family: monospace; - font-size: inherit; - color: navy; -} - div.tableblock { margin-top: 1.0em; margin-bottom: 1.5em; @@ -452,12 +454,6 @@ * * */ -.monospaced { - font-family: monospace; - font-size: inherit; - color: navy; -} - table.tableblock { margin-top: 1.0em; margin-bottom: 1.5em; @@ -537,6 +533,8 @@ @media print { body.manpage div#toc { display: none; } } + + </style> <script type="text/javascript"> /*<+'])'); + var re = new RegExp('[hH]([1-'+(toclevels+1)+'])'); // Function that scans the DOM tree for header elements (the DOM2 // nodeIterator API would be a better technique but not supported by all // browsers). @@ -610,7 +608,7 @@ var i; for (i = 0; i < toc.childNodes.length; i++) { var entry = toc.childNodes[i]; - if (entry.nodeName == 'div' + if (entry.nodeName.toLowerCase() == 'div' && entry.getAttribute("class") && entry.getAttribute("class").match(/^toclevel/)) tocEntriesToRemove.push(entry); @@ -656,7 +654,7 @@ var entriesToRemove = []; for (i = 0; i < noteholder.childNodes.length; i++) { var entry = noteholder.childNodes[i]; - if (entry.nodeName == 'div' && entry.getAttribute("class") == "footnote") + if (entry.nodeName.toLowerCase() == 'div' && entry.getAttribute("class") == "footnote") entriesToRemove.push(entry); } for (i = 0; i < entriesToRemove.length; i++) { @@ -841,7 +839,7 @@ occurred a long time ago. By default, unresolved conflicts older than 15 days and resolved conflicts older than 60 days are pruned. These defaults are controlled via the -<tt>gc.rerereunresolved</tt> and <tt>gc.rerereresolved</tt> configuration +<code>gc.rerereunresolved</code> and <code>gc.rerereresolved</code> configuration variables respectively. </p> </dd> @@ -857,35 +855,35 @@ even before your topic branch is ready to be pushed upstream:</p></div> <div class="listingblock"> <div class="content"> -<pre><tt> o---*---o topic +<pre><code> o---*---o topic / - o---o---o---*---o---o master</tt></pre> + o---o---o---*---o---o master</code></pre> </div></div> <div class="paragraph"><p>For such a test, you need to merge master and topic somehow. One way to do it is to pull master into the topic branch:</p></div> <div class="listingblock"> <div class="content"> -<pre><tt> $ git checkout topic +<pre><code> $ git checkout topic $ git merge master o---*---o---+ topic / / - o---o---o---*---o---o master</tt></pre> + o---o---o---*---o---o master</code></pre> </div></div> -<div class="paragraph"><p>The commits marked with <tt>*</tt> touch the same area in the same +<div class="paragraph"><p>The commits marked with <code>*</code> touch the same area in the same file; you need to resolve the conflicts when creating the commit -marked with <tt>+</tt>. Then you can test the result to make sure your +marked with <code>+</code>. Then you can test the result to make sure your work-in-progress still works with what is in the latest master.</p></div> <div class="paragraph"><p>After this test merge, there are two ways to continue your work on the topic. The easiest is to build on top of the test merge -commit <tt>+</tt>, and when your work in the topic branch is finally +commit <code>+</code>, and when your work in the topic branch is finally ready, pull the topic branch into master, and/or ask the upstream to pull from you. By that time, however, the master or -the upstream might have been advanced since the test merge <tt>+</tt>, +the upstream might have been advanced since the test merge <code>+</code>, in which case the final commit graph would look like this:</p></div> <div class="listingblock"> <div class="content"> -<pre><tt> $ git checkout topic +<pre><code> $ git checkout topic $ git merge master $ ... work on both topic and master branches $ git checkout master @@ -893,7 +891,7 @@ o---*---o---+---o---o topic / / \ - o---o---o---*---o---o---o---o---+ master</tt></pre> + o---o---o---*---o---o---o---o---+ master</code></pre> </div></div> <div class="paragraph"><p>When your topic branch is long-lived, however, your topic branch would end up having many such "Merge from master" commits on it, @@ -906,7 +904,7 @@ top of the tip before the test merge:</p></div> <div class="listingblock"> <div class="content"> -<pre><tt> $ git checkout topic +<pre><code> $ git checkout topic $ git merge master $ git reset --hard HEAD^ ;# rewind the test merge $ ... work on both topic and master branches @@ -915,19 +913,19 @@ o---*---o-------o---o topic / \ - o---o---o---*---o---o---o---o---+ master</tt></pre> + o---o---o---*---o---o---o---o---+ master</code></pre> </div></div> <div class="paragraph"><p>This would leave only one merge commit when your topic branch is finally ready and merged into the master branch. This merge would require you to resolve the conflict, introduced by the -commits marked with <tt>*</tt>. However, this conflict is often the +commits marked with <code>*</code>. However, this conflict is often the same conflict you resolved when you created the test merge you blew away. <em>git rerere</em> helps you resolve this final conflicted merge using the information from your earlier hand resolve.</p></div> <div class="paragraph"><p>Running the <em>git rerere</em> command immediately after a conflicted automerge records the conflicted working tree files, with the -usual conflict markers <tt><<<<<<<</tt>, <tt>=======</tt>, and <tt>>>>>>>></tt> in +usual conflict markers <code><<<<<<<</code>, <code>=======</code>, and <code>>>>>>>></code> in them. Later, after you are done resolving the conflicts, running <em>git rerere</em> again will record the resolved state of these files. Suppose you did this when you created the test merge of @@ -939,8 +937,8 @@ If this three-way merge resolves cleanly, the result is written out to your working tree file, so you do not have to manually resolve it. Note that <em>git rerere</em> leaves the index file alone, -so you still need to do the final sanity checks with <tt>git diff</tt> -(or <tt>git diff -c</tt>) and <em>git add</em> when you are satisfied.</p></div> +so you still need to do the final sanity checks with <code>git diff</code> +(or <code>git diff -c</code>) and <em>git add</em> when you are satisfied.</p></div> <div class="paragraph"><p>As a convenience measure, <em>git merge</em> automatically invokes <em>git rerere</em> upon exiting with a failed automerge and <em>git rerere</em> records the hand resolve when it is a new conflict, or reuses the earlier hand @@ -957,7 +955,7 @@ development on the topic branch:</p></div> <div class="listingblock"> <div class="content"> -<pre><tt> o---*---o-------o---o topic +<pre><code> o---*---o-------o---o topic / o---o---o---*---o---o---o---o master @@ -965,9 +963,9 @@ o---*---o-------o---o topic / - o---o---o---*---o---o---o---o master</tt></pre> + o---o---o---*---o---o---o---o master</code></pre> </div></div> -<div class="paragraph"><p>you could run <tt>git rebase master topic</tt>, to bring yourself +<div class="paragraph"><p>you could run <code>git rebase master topic</code>, to bring yourself up-to-date before your topic is ready to be sent upstream. This would result in falling back to a three-way merge, and it would conflict the same way as the test merge you resolved earlier. 